Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 22 Jun 2010 22:50:34 +0000 (22:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 22 Jun 2010 22:50:34 +0000 (22:50 +0000)
commitca618ecc3aefe2d99cb552a9c9d235aa3d6f2d06
treea1c7e314d8aef5348acb2f553af91ecf83cdd52e
parent94c73a71555687b12e46780f95164b5df30c5491
parentc066a0b8a411dc4685e788f9ef95a039a5e7d377
Merge from mainline.